From: awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Date: Wed, 31 May 2006 20:34:33 +0000 (-0600)
Subject: [IA64] remove linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16012
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=e91bc4619d519e44fa682abb29994a388c686d32;p=xen.git

[IA64] remove linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c

Inline the content of early_console_setup() to setup.c and remove
xenconsole.c

Signed-off-by: Aron Griffis <aron@hp.com>
---

diff --git a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
index 77325e2d1e..b0f737e16f 100644
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
@@ -347,8 +347,14 @@ early_console_setup (char *cmdline)
 	int earlycons = 0;
 
 #ifdef CONFIG_XEN
-	if (!early_xen_console_setup(cmdline))
+#ifndef CONFIG_IA64_HP_SIM
+	if (is_running_on_xen()) {
+		extern struct console hpsim_cons;
+		hpsim_cons.flags |= CON_BOOT;
+		register_console(&hpsim_cons);
 		earlycons++;
+	}
+#endif
 #endif
 #ifdef CONFIG_SERIAL_SGI_L1_CONSOLE
 	{
diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/Makefile b/linux-2.6-xen-sparse/arch/ia64/xen/Makefile
index da3ca07cd0..7a3d1a1f63 100644
--- a/linux-2.6-xen-sparse/arch/ia64/xen/Makefile
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Xen components
 #
 
-obj-y := hypercall.o xenivt.o xenentry.o xensetup.o xenpal.o xenhpski.o xenconsole.o
+obj-y := hypercall.o xenivt.o xenentry.o xensetup.o xenpal.o xenhpski.o
 
 obj-$(CONFIG_XEN_IA64_DOM0_VP) += hypervisor.o pci-dma-xen.o util.o
 pci-dma-xen-$(CONFIG_XEN_IA64_DOM0_VP) := ../../i386/kernel/pci-dma-xen.o
diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c b/linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c
deleted file mode 100644
index 4c6d9eae90..0000000000
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <linux/config.h>
-#include <linux/console.h>
-#include <asm/hypervisor.h>
-
-int
-early_xen_console_setup (char *cmdline)
-{
-#ifdef CONFIG_XEN
-#ifndef CONFIG_IA64_HP_SIM
-	if (is_running_on_xen()) {
-		extern struct console hpsim_cons;
-		hpsim_cons.flags |= CON_BOOT;
-		register_console(&hpsim_cons);
-		return 0;
-	}
-#endif
-#endif
-	return -1;
-}